Just return if the parameters are identical. (#150159, Robert Ögren)

Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
	parameters are identical. (#150159, Robert Ögren)

diff --git a/ChangeLog b/ChangeLog
index e49030d449a5142013f266f43dcd8b977b0032cd..b4741e23ececddffb8ddcc11aed58e2b6d238d07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtksequence.c (_gtk_sequence_move): Just return if the
+       parameters are identical. (#150159, Robert Ögren)
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e49030d449a5142013f266f43dcd8b977b0032cd..b4741e23ececddffb8ddcc11aed58e2b6d238d07 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtksequence.c (_gtk_sequence_move): Just return if the
+       parameters are identical. (#150159, Robert Ögren)
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e49030d449a5142013f266f43dcd8b977b0032cd..b4741e23ececddffb8ddcc11aed58e2b6d238d07 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtksequence.c (_gtk_sequence_move): Just return if the
+       parameters are identical. (#150159, Robert Ögren)
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e49030d449a5142013f266f43dcd8b977b0032cd..b4741e23ececddffb8ddcc11aed58e2b6d238d07 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtksequence.c (_gtk_sequence_move): Just return if the
+       parameters are identical. (#150159, Robert Ögren)
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle 

diff --git a/gtk/gtksequence.c b/gtk/gtksequence.c
index d9aede40173f7bb5cc936bf4454fe69583682f41..6ecf2600134e3155f4d373ec8428e9be96d338c4 100644 (file)
--- a/gtk/gtksequence.c
+++ b/gtk/gtksequence.c
@@ -177,6 +177,7 @@ _gtk_sequence_append             (GtkSequence               *seq,
   last = _gtk_sequence_node_find_last (seq->node);
   _gtk_sequence_node_insert_before (last, node);
 }
+#if 0
 
 void
 _gtk_sequence_prepend            (GtkSequence               *seq,
@@ -192,6 +193,7 @@ _gtk_sequence_prepend            (GtkSequence               *seq,
   
   _gtk_sequence_node_insert_before (second, node);
 }
+#endif
 
 GtkSequencePtr 
 _gtk_sequence_insert             (GtkSequencePtr             ptr,
@@ -203,9 +205,15 @@ _gtk_sequence_insert             (GtkSequencePtr             ptr,
   
   node = _gtk_sequence_node_new (data);
   node->sequence = ptr->sequence;
+
+  g_print ("%p\n", ptr->sequence);
+
+  g_print ("before: %d\n", _gtk_sequence_get_length (ptr->sequence));
   
   _gtk_sequence_node_insert_before (ptr, node);
 
+  g_print ("after: %d\n", _gtk_sequence_get_length (ptr->sequence));
+
   return node;
 }
 
@@ -385,7 +393,10 @@ _gtk_sequence_get_ptr_at_pos     (GtkSequence               *seq,
   len = _gtk_sequence_get_length (seq);
   
   if (pos > len || pos == -1)
-    pos = len;
+  {
+      g_print ("adjusting pos from %d to %d\n", pos, len);
+      pos = len;
+  }
   
   return _gtk_sequence_node_find_by_pos (seq->node, pos);
 }
@@ -405,6 +416,9 @@ _gtk_sequence_ptr_is_begin       (GtkSequencePtr             ptr)
   return (_gtk_sequence_node_prev (ptr) == ptr);
 }
 
+/* If you call this on an end pointer you'll get
+ * the length of the sequence
+ */
 gint
 _gtk_sequence_ptr_get_position   (GtkSequencePtr             ptr)
 {
@@ -1086,6 +1100,9 @@ void
 _gtk_sequence_move (GtkSequencePtr ptr,
                    GtkSequencePtr new_pos)
 {
+  if (ptr == new_pos)
+    return;
+  
   _gtk_sequence_unlink (ptr->sequence, ptr);
   _gtk_sequence_node_insert_before (new_pos, ptr);
 }